Fixed All Classes to play nice with Directories.