Add settings and schedule initial setups, controllers, add toggle directory base
Merge remote-tracking branch 'origin/master'