Consolidated geometric primitives into a sub-directory