Hopefully this makes it easier to import the project into eclipse.
Either that or it breaks everything and I have to hope that I branched
things right.