Removed scope settings
Fixed file rename problems with refactoring