Groups and layers

Snapshot taken from some of my layers and its groups of a template page I'm working on. It only shows the part that contains the interaction when the user needs to choose a date via a calendar and where he can choose 'right now', a future date or a period (from and end date). Trying to keep things as organized as possible, not only for myself, but also for the dev team ;)