Modules directory fix;
user task fix;