Final restructuring to further differentiate each structure and algorithm