Moved files to proper places