Changed directory structure and dependency change junit 3.8 to 4.12