Switched to the new dir structure.