Added new class: "Dir". Also added tests for this.