refactoring
clean up file names