Start cutting up the monolythic client