Reorganize develop from master

[rennergade]

Somehow this was left where master is now nicely organized into sub-folders but develop is a mess. This is kind of an annoying merge due to some changes downstream on develop, but it would be great to get these synced!