More refactoring of structure. Won't build.