major architecture overhaul (packages)