Simple Directory Restructure
Fixed Control Modes Widget