refactored modules; added new_deps