Moved everything to its right place.