Change to use relative paths for client classes and remove the 'client' path alias