moved everything to one file