moved everything to right location