some fixes and files moved

No match.