Modularised all the ruby code, mark obsolete hosts when naming