Cleanup

Ran macro to clean out non used using statements and to sort the using statements.    Ran macro in super module also. 

Organized Settings files to be together.