Add scaffold of EndState
Fix bug caused by spaces in project file name