Minor alterations
Rearranged the files