Moved files to where they should be