packages and modules renamed to improve consistency
Layout of Grids improved