clean up and fix pathes due to structure refactoring