Refactoring from Interface /  Impl package structure