mk6 - Minor formatting done

Renamed some folders and files