Tasking update

Better module structure