move everything into inner package