#18 in progress

- fix source folders layout
- fix unit tests