Moved J_Shape into new J_Geometry model away from J_UI. Also split shapes into different headers