Revert "Convert to simple project structure."

This reverts commit a1c0663002660dc4c33fc9d55401d577a833a81a.