source: finished general refactor/reorg