Moved everything to main folder