Moved files to proper locations