Restructuring and Uploaded tutorial 2