Import hamcrest-core-1.3.jar
Fix junit testing and Modify build directory structure