Renamed and moved everything and made dir links 2