Updates to improve project templates. Some bugs exist. Related to #65