Fixed several broken import paths.
Fixed small bug introduced during refactoring.