Organized preferences into categories
Updated readme
Various refactor