Tweaks for archetype generation, removed unneeded files.