Revert 54967a3..973089d

This rolls back to commit 54967a3345a193ad42489e8ae827e7b39eb2da1a.
Reverted: Moved stuff around, works as before