refactored archetypes to reflect module changes