Moved stuff around

Started using desktop github so no "save button is commit"