Refactoring of directory layout