Refactor: modified to correct packaging