Restructure layout of files