rename and move main package into module