Adding a client. Moving things into appropriate modules.