Simplify control architecture
Merge pull request #175 from elemoine/control

Simplify control architecture