Moved url to system and session to library