Revert "First step towards modularization"

This reverts commit ab73b60364161ceb1f85d4c983e5663fd0e2f39a.