Revert "original structure is out of sync with github"

This reverts commit 8a793e097c75856b7fdd55a5f9d4ed1984e81cae.