Revert "Fix includes and change include structure to be modular"

This reverts commit 47f8e1b03d4771f173d0c0927636d1c4f373999e.