Restruct source orgnization