Add PopUser module into Phire and start refactor