Improve of the directory structure