Fix some directories to be more logical