refactoring to new package structure
refactoring directory scanning