Generic components

I was rather addressing the structure again (not the naming). Once, you have Archives/Archive/Components/Component and in the generic case its Components/Component. Its basically addressing the same issue as above in line 143. This time for xml.