Some TODOs resolved. Labeling added for destination directories. Some more improvements