Migrated new stuff to main folder and removed old