Misc changes
Move most of the frameworks config.xml to common tree.