Refactoring to move client code into subfolder.