Card #447 split up solid geometry (with title fixes)

Card #447 split up solid geometry with title fixes.