also reverted moving differ and configuration to main package