Cleaned up build directory structure