Re-organized manifests and dependencies