extension directory structure cleaned up. Now there is only one.