better file structure