Move to correct folders, and some fixes