metadata: added initial default mappings
reader: cleaned up unused else/if-blocks
tests: removed metadata from reader tests
mapper: started integrating reader as nested class
mapper: added reader as nested class
reader_test: changed to nested class; removed unnecessary imports
removed unnecessary spaces