refactored code packaging to be consistent with other modules