Moving files to follow conventions