Move root files/folders to appropriate folders
Merge pull request #1003 from DavidRagazzi/move-files-from-root

Move files from root to appropriate folders