Removed cross module dependencies