del Dict, rename classes, add methods to NullCommand, add keys to Dir