-add unit test.
-re-factoring the folder.