Renamed and refactored project