rearranging some directory structure and adding a tests
Merge pull request #6 from OceanLabs/stuff

rearranging some directory structure and adding a tests