progress with project view — refactorings