Re-Organize default.xml