Renamed project e cleaned up folders