Updated file structure for clarity