Refactoring cloud controller component to simplify the package structure