Restructed the files