try to organize things a bit
Merge branch 'personal' of https://github.com/jmnemonix/Hyppo into personal