Added project templates, fixed naming conventions