Simplified main manifests, added classes for various other things I want running on the box