rearranged folders to ContentProviders