Updates for plugin and using permalinks

Merged in changes for permalinks and building out the different structures.

Feedback welcome :grinning: