restructuring. now based on p4notelte-common