Moving files to reflect namespace structure