Move info/data handlers into subdirectory