Reorganize and add settings support -> 0.9.2