big reorg of common to make directories flatter and easier to see where things are