Update structure, add unittests and update readme