Clean up and possible restructure
Merge branch 'master' of github.com:seanstar12/suNtg