Restructured folder organisation and minor cleanups

Change-Id: I55d355c4b04ebfb7b466a20207c984a309fa6df7
Merge pull request #20 from rdumusc/streamperf

Restructured folder organisation and minor cleanups