adding smarter file structure