Moving files to proper places, fixing some code