added Structure and Descriptive Type Elements. Changed Generator reponsibilities
deleted ShapeTest.php