Another significant refactor.
Fixed require paths.