Moved everything, git things I deleted/rewrote everything, urgh
Fixes