fix directories and build