The only simple option I can think of at the moment is just not having a .Core project. Having a single .site project where umbraco and site is installed and just move all the code over to that.