Renamed file; add command parser