More effort standardizing code, splitting classes, and namespacing.