Reorganization to clarify dependencies

We should first check whether we still need it with current trunk, as @JasonGross suggested.