did some refactoring with paths and URLs