Reorganization

Conflicts:
	default.xml