Moved everything to right folder