Put lights&shapes into their own directories