Adding JUnit testing

* Adding JUnit testing
* Reordering some files