Restructred the order which some of the files were included in.