src root + refactoring