Preparing to use a more "traditional" multi-module project layout. Arghhh.