refactoring directory structure part 1