Merge Adrian's exhaustive module dir restructure changes
authorTony Cook <tony@develop-help.com>
Mon, 1 Sep 2014 12:20:44 +0000 (22:20 +1000)
committerTony Cook <tony@develop-help.com>
Mon, 1 Sep 2014 12:20:44 +0000 (22:20 +1000)

Trivial merge