Made plugin private
Rearranging some stuff