Major project reordering and refactoring.