Changing distributions folder name
Adding distribution folder final name
Fixing timeout issues