some cleanup here and there
Move files to separate directories for clarity
Sync