misc
merged
make things smaller
misc
build directory per configuration
complexity cleanup
misc