Rename "desktop-common" to "desktop", "desktop-lwjgl" to "client" and "desktop-headless" to "server"
Merge remote-tracking branch 'origin/master'