updated project structure
Merge pull request #5 from mwolski89/dev

Added tests