Replaced NULL with nullptr
Tiny refactoring
Added Dir class