Restructure
Trying some deploy stuff