Revert "Restructured source"

This reverts commit 9aa7e0d476d87f3edf9b6a0ba721aceef23c3831.