Move files out of general directory.
Add operator<.