Types Name, Type, LocInfo, and Locator merged with Files. Refs: #138.

Signed-off-by: Josef Templ <josef.templ@gmail.com>