move identifiers inside packages