(minor) reformats so package declarations come after the copyright; tidies up the equality test + code for DirectoryDescriptor