Better dir structure, switch to make from cmake.