Removed Features namespace. RuntimeSettings moved to main namespace
A small refactoring