change package name and structure