moving common files to shared lib, desktop version