Doing away with included modules!