Cleaned up Directory class and suppressed warnings on DirectoryNavigator