Tidied the client models
Updated the client routing layout to improve nested functionality