Changed directory structure.
Added tester.