namespace change, restructuring project