updated directory structure, added unit test