Refactoring, removing "client/impl" package since types included are not implementations but base classes