Restructure framework into a sensible hierarchy (WIP)