Reworked on archetypes
Merge branch 'master' of https://github.com/OsgiliathEnterprise/net.osgiliath.parent.git