Revert "move some common-prefix files into subdirs"

It's a pain to deal with more than one level of subdirs here...

This reverts commit 5082556e76edb2eff67f9fd6a1b975e23e409732.
betterize header file ifdef wrapper defines