rearranged the heirachy of the software and changed some stuffs.