[improvement] package re-arranged