The library directory structure could be simplified for ease of use, but better done with a separate commit.