Moved miscellaneous files out of folder to aid running.
Refactored file names to be consistient capitalization with the code (for Unix support).
Corrected Merge conflicts (due to filename changing).