Updated directory structure, added unit test example