cleaned up the modules a lot, and integrating tasks into the wrapper task.py