Renamed and Refactored entire project