Merged server and client into default recipe, changed config to LWRPs.  Still a lot of cruft to clean up