Added directivity classes, updated docs, updated imports