Refactor. Moved the connector package to fall under controller as it is implementation specific.