moved files from root to appropriate folders
Fix references to moved files