Reorganizing packages, layout names