Rework the Zone object
Rename all of the files completed
Start work on airflow elements