This gives a more complete picture.
No need for the extra subdirectory, and the name should match the module name.
