refactoing: splitting in 2 controllers