move internal pkg to internal
avoid import cycle in test