moved all implementations to one package
mappings now interface, mappingsimpl now implementation
still some bugs, check it tomorrow