Wrote circle and rectangle directives. Added more examples. Overall changes to structure.