Code reorganise
Merge branch 'master' of https://github.com/martindurant/misc