Reverting commented out archetype modules..
GWT: archetypes fixes..