Change Controller to Commands

Refactor Part 1