More renaming, combined client + server projects, added image handler