Some reorganization, settings activity and support library.