Initial commit of independent non-3d classes