Cropped out legacy archetype files.
Started new package names. Cleaned up.