[REFACTOR] renamed packages