Corrected folders structure and created dependency from library
added unit tests