Refactory controladoria to system