Organizing controllers

Just a start