Moved everything to one file only
Removed old files