Shapes moved to outer dir.