Improve the directory structure even more