Fixed location of sources and package name.
Added mapper for not-null objects.
Added mapper, that passes null objects.