New build files organized little more