Broke out supporting classes into there own manifests
Actually going to commit new manifests