Fix build
Restructure build system