llv22 - re-organize source code