improved the dir structure as per cpan and added few test cases