Reorganize build type lists