Moved some common groups into separate files