renamed project and added singleton model