Organized the file structure
Merged