Cleaned up build dir struct