1e version of components and macro prototype
xsd fixes