code spitted into several compilitation units, renames, cleanup