Major rewrite

Rewrite of code base, including exporting the shortcodes out to a plugin