Started seperating model and controllers

Signed-off-by: flaquitobello <flaquitobello@github.com>