Move source code to src/main, create src/test for JUnit, part 2