trying out some experimental source code reorganization to improve compile times
Flattened the build structure somewhat.
fixes for some compile problems
fixes