formatting
renamed confusing files and fixed contentprovider bugs