Cleaned up the directory structure
Added misssing tag files
Merge pull request #296 from jcla1/master

Some misc work on the directory structure and tag files