Restructure

Fuck you Codeship