Better build system and dir tree