More work on setting up the proper dir structure.