Clean up settings modules imports. Fix #9