merged control-flow lessons, reorganized lessons folder