Finnished a bit of refactoring: some paths were erroneous.