breaking: fix dep conflicts, path changes and solution cleanups - need to adjust deployment for this change