Minor reorganizations (rename and new file for http hadlers)