Some misc work on the directory structure and tag files