Restructure

Restructured folder structure