Re-structure as a package