added tests, tested little bit, restructured file tree