Cleanup

Ran macro to clean out non used using statements and to sort the using statements.

Organized settings files to be together.