Reorganizing and frontend mockup