restructured directories; added unit test