Moved files to appropriate directories, updated paths