refactor bundle names & structure