Rename dirs to simplify build scripts