Working on fixing the module paths
Updated the ToDo