Drastic restructure of package architecture.