(cleanup) Flattened use hierarchy by using absolute paths.
Merge pull request #168 from reem/cleanup/use-absolute

(cleanup) Flattened use hierarchy by using absolute paths.