Restructure

Restructured the folder structure