Rename 2 level of package and continue development.