- Renamed and fixed some path issues inside project