Update 2

Removed and updated the file structure.