refactoring of directory structure