Structural cleanup and independent header files.