Refactoring, cleanup, and settings files
Refactoring and added settings files (2)