Reordered dir structure
Removed old files in bad directories