Reorganizing the internals for a more standard structure.