REFACTOR: move templates..client to client