Refactor package

Change package from org to com