mesona: reorganize dir to match newer repos

Change-Id: Ic8cd591cfdef8b960234f2a5b22161817df972be