Re-organized modules and manifests