Moved common code into common trunk