Cleaned file structure