Package renamed from com to org, and improved desktop support