Fixing small errors
Reorganising file