Fixed some naming in files.

psycopg replaced with psycopg2.
seperated imports of plugins and sys_plugins