Minor structural improvements

Trying to split up really large files, reduce bulky dependencies.