ENH Fix package structure & mergedir binary