cleaned file structure