restructuring files wit ectend methods
update extend manipulation