moved everything to correct folders