Make base directories only
Merge branch 'master' of https://github.com/jgoguen/calibre