Cleanup Files, sort files etc.
Cleanup2
Merge pull request #712 from vbawol/File-System-Cleanup

Cleanup Files, sort files etc.