Renamed main file; added some solutions