improved template code and plugin class
improvements to structure of classes
removed all code related to plugin being a custom post type
fix merge conflicts