Changes repo structure and adds JUnit