Move funcionality about flavors to different module