Revert "WIP: Fragmented control dir" from master
This reverts merge request !1145 (merged)
This MR was wrongly merged into master. It should actually have been closed. The fragmented control dir changes are already in the next branch, as we simply renamed the dev-controldir branch to next.
Edited by Maiken