Moved files to where they belong