Move cloudfoundry features to own module