refactored archetype structure
fixed packaging