Finished file Restructuring