Updated to work with new package structure.