Changed some imports because of project renaming