Move DirectoryType to common
Use Xstream for marshalling