Renamed folder structure and created new solution file