added tests
tests added; directory structure changed