Divided layout
Reorganized helpers (and methods)
Auto-updater
Fixed missing import
Auto-updater cleanup