Organize public resources

Conflicts:
	core/res/res/values/public.xml