#34 Reorganized build system