Cleaned up IPowers and organised imports.