WIP - reorganization and breaking out resolutions into individual modules