restructure mstools project