Make file names consistent instead of redundant with their directory name