- Change build system layout, fixup some more issues