Moving to the directory structure the IDE wants
cleanup