Better structure for the client application