Got rid of directories