introducing advoocat namespace + some cleanups. Closes #2