improve the file/directory structure