Fixed all the imports; cleaned some commented code.
Deleted folder labs.
Merge remote branch 'upstream/master'