decouple from jeebus (except base/ files)