Reorganized and removed unnecessary dependencies across all modules