A few new things
Merged pull request from Mark with a bunch of changes and adjusted the directory layout so it is a bit cleaner for future additions..
Merged pull request from Mark with a bunch of changes and adjusted the directory layout so it is a bit cleaner for future additions..