Architectural changes

--HG--
branch : ArchivingIMDI