Restructuring file structure