Merged two directories into one main