altered directory structure a bit to make room for tests
altered directory structure a little and added tests file