Add unordered-containers.
Remove some unwanted whitespace.
Remove unwanted whitespace from Config files.
Reorganize project for simplicity.