Removed unnecessary classes.
Fixed creation of directories.