Removed dir files. Consolidating everything into file.* files