~Maven restructure for client