Added before major modifications
Reorganized repo, added tests