Moving package module to some place more sensible.