Change build system, re-organize