Re-structure, this makes the most sense. Now this is the "super" package.