Small fixups to dir structure and naming