Restructure

Restructured files