Organize bundle structure