Move Ray class to other module