[refactor] remove unused & move package