[PIII-21]

[PIII-21] Rearrange code to provide library and test app independently