cleanup and refactoring
add beginning of pathcollections