Reorganizing layer declarations.