Re-arranged dependency module.