refactoring of .views
refactoring
refactoring
refactoring
cleanup path handling
cleanup path handling