moved everything to one folder