Using Project template classes in project API
Renaming and restructring in progress