Fix spring.factories
Move cloudfoundry features to own module