Renaming fields finished. Some content added.

State before Training with Martin Martinov.

Signed-off-by: Kresimir Nikolic <kresimir.nikolic@gmail.com>