start refactoring
refactoring directories