Restructure

Restructured for repository compatibility