Forgot to make a branch but I removed test code from Neil's PR
Forgot to make a new branch
Looks like A LOT of commits but it isn't. This is just a renaming to caps
More changes
Removed webinfo from repo
Merge pull request #87 from Lynart/folderStructure

Folder structure
merged master with my master