reformat constructors to accept session token
remove old classes