* First general cleanup pass * Review feedback * Fix build * Fix tests
* Fix kapt and source sets * cleanup * cleanup 2