updated module structure and split apart parts into logical areas a la Fabric