Refactored package from 'com' to 'org'