Got rid of directory structure