Moving stuff around a lot
Rename plugin client file
Add session id's