build-tools field parsing added, some classes renamed)