fix build, refactor manifests and tasks