adding more XML layouts, and matching CLASS files