Updated structure to allow for jshinting and concat of plugin and main.js file