Changed Structure Of The Plugin