Refactored configurations out of the classpath, removed unused autoscaling plugin
Fixed merge conflict