Updated file structure for better organization