Adding lightsource class and click and move