Removing working directory imports.

Needed for having more build directories from same checkout directory
(not fully done yet).
Merge pull request #2570 from tklein23/remove_working_dir_imports

Removing working directory imports.