continued major refactoring and move to lit coffee files