Reorganize and add LGE