clean up directory to reflect file name conventions