project: refactor in a huge way -- I realize this is a bad commit message