Fixed some require statement errors stemming from old refactoring.