"combine them for now and separate them later if needed"

yep