Add some stuff and move concurrent tasks in other package