Refactoring of classes. Settings file added