#SENSSOFT-193: Cleaning up directory structure including tests