Restructured the project, add junit to the pom.