Added raytrace and removed unneeded modules