Refactor into packages and static classes