-*-Ray-*- moved, refactored, improved everything..