Revert "moved to subdirectories"

This reverts commit d5b32e431241d1b04167ee071b5a1c71ea74dd5e.