move code to trunk