Issue#108: get rid of src/cpp dir
Issue #108: remove unused code and includes