update to v1_1 and reorganization