Moving systems into their own libraries. This should help remove dependencies.