Revert "Fixing more paths"

This reverts commit 0ea9a73f369db48f2ade9649fd2bef8445602b02.
Revert "More path fixes"

This reverts commit b4b20ac6333155accbba60eb5f7fd1b47d49c9c4.
Revert "Trying path changes"

This reverts commit 76020d5f610e94c7344245e18e9a3e43ba08ebf4.
Revert "Pushing towards a better naming"

This reverts commit 60679bc8175bf23ef40dcb5682efe7fb91caeb9a.