Refactoring build directories.
More refactoring.