Reestructuring all the code, sweeping all the neighbor regions for mixing them up