snapshot
refactoring directory layout