Restructure layout of directories