reorganization
also create bundle dir