slightly re-organise
Merge pull request #929 from tshepang/re-org

slightly re-organise