Added Plugins and Rearranged Structure