rearrange directories for better git branch comparison