Revert "Code Cleanup / Modularization"

This reverts commit 6a02e908e93db7d01f26c1892a5806bf0dad080e.