Moved shape to a new directory
added allocation of shapes