shifted org structure
resolved merge conflicts