Ruby class/module restructure