Move manager class away from CLI