httplib -> httplib2
Slight changes to FS structure.