Moved everything to the right folder