Cleaned file structure
Cleaned file structure