improving file structure