Merged range.h and range.cpp into range.hpp