diff --git a/data/racecar/racecar.urdf b/data/racecar/racecar.urdf
index c33450464..3235819cf 100644
--- a/data/racecar/racecar.urdf
+++ b/data/racecar/racecar.urdf
@@ -8,8 +8,19 @@
   <!-- geometry macros -->
   <!-- transmission macros -->
   <!-- Add chassis and it's inertia link -->
-  <link name="base_link"/>
+  <link name="base_link">
+   <inertial>
+      <origin rpy="0 0 0" xyz="0 0 0"/>
+      <mass value=".1"/>
+      <inertia ixx="0.010609" ixy="0" ixz="0" iyy="0.050409" iyz="0" izz="0.05865"/>
+    </inertial>
+  </link>
   <link name="chassis">
+   <inertial>
+      <origin rpy="0 0 0" xyz="0 0 0"/>
+      <mass value=".1"/>
+      <inertia ixx="0.010609" ixy="0" ixz="0" iyy="0.050409" iyz="0" izz="0.05865"/>
+    </inertial>
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
@@ -478,8 +489,5 @@
   <material name="red">
     <color rgba="0.8 0.0 0.0 1.0"/>
   </material>
-  <material name="white">
-    <color rgba="1.0 1.0 1.0 1.0"/>
-  </material>
 </robot>
 
diff --git a/examples/pybullet/gym/kukaJointSpaceGymEnvTest.py b/examples/pybullet/gym/kukaJointSpaceGymEnvTest.py
deleted file mode 100644
index b65da1354..000000000
--- a/examples/pybullet/gym/kukaJointSpaceGymEnvTest.py
+++ /dev/null
@@ -1,23 +0,0 @@
-
-from pybullet_envs.bullet.kukaGymEnv import KukaGymEnv
-import time
-
-
-environment = KukaGymEnv(renders=True)
-environment._kuka.useInverseKinematics=0
-  
-motorsIds=[]
-for i in range (len(environment._kuka.motorNames)):
-  motor = environment._kuka.motorNames[i]
-  motorJointIndex = environment._kuka.motorIndices[i]
-  motorsIds.append(environment._p.addUserDebugParameter(motor,-3,3,environment._kuka.jointPositions[i]))
-
-while (True):
-    
-  action=[]
-  for motorId in motorsIds:
-    action.append(environment._p.readUserDebugParameter(motorId))
-  
-  state, reward, done, info = environment.step(action)
-  obs = environment.getExtendedObservation()
-  time.sleep(0.01)
diff --git a/examples/pybullet/gym/pybullet_envs/data/racecar/racecar.urdf b/examples/pybullet/gym/pybullet_envs/data/racecar/racecar.urdf
index c33450464..3235819cf 100644
--- a/examples/pybullet/gym/pybullet_envs/data/racecar/racecar.urdf
+++ b/examples/pybullet/gym/pybullet_envs/data/racecar/racecar.urdf
@@ -8,8 +8,19 @@
   <!-- geometry macros -->
   <!-- transmission macros -->
   <!-- Add chassis and it's inertia link -->
-  <link name="base_link"/>
+  <link name="base_link">
+   <inertial>
+      <origin rpy="0 0 0" xyz="0 0 0"/>
+      <mass value=".1"/>
+      <inertia ixx="0.010609" ixy="0" ixz="0" iyy="0.050409" iyz="0" izz="0.05865"/>
+    </inertial>
+  </link>
   <link name="chassis">
+   <inertial>
+      <origin rpy="0 0 0" xyz="0 0 0"/>
+      <mass value=".1"/>
+      <inertia ixx="0.010609" ixy="0" ixz="0" iyy="0.050409" iyz="0" izz="0.05865"/>
+    </inertial>
     <visual>
       <origin rpy="0 0 0" xyz="0 0 0"/>
       <geometry>
@@ -478,8 +489,5 @@
   <material name="red">
     <color rgba="0.8 0.0 0.0 1.0"/>
   </material>
-  <material name="white">
-    <color rgba="1.0 1.0 1.0 1.0"/>
-  </material>
 </robot>
 
diff --git a/examples/pybullet/gym/pybullet_envs/examples/__init__.py b/examples/pybullet/gym/pybullet_envs/examples/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/examples/pybullet/gym/enjoy_TF_AntBulletEnv_v0_2017may.py b/examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_AntBulletEnv_v0_2017may.py
similarity index 99%
rename from examples/pybullet/gym/enjoy_TF_AntBulletEnv_v0_2017may.py
rename to examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_AntBulletEnv_v0_2017may.py
index 76006f141..02691e0fc 100644
--- a/examples/pybullet/gym/enjoy_TF_AntBulletEnv_v0_2017may.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_AntBulletEnv_v0_2017may.py
@@ -1,3 +1,10 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os
+import inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 import numpy as np
 import pybullet as p
diff --git a/examples/pybullet/gym/enjoy_TF_HalfCheetahBulletEnv_v0_2017may.py b/examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_HalfCheetahBulletEnv_v0_2017may.py
similarity index 99%
rename from examples/pybullet/gym/enjoy_TF_HalfCheetahBulletEnv_v0_2017may.py
rename to examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_HalfCheetahBulletEnv_v0_2017may.py
index 921425f74..9a9408060 100644
--- a/examples/pybullet/gym/enjoy_TF_HalfCheetahBulletEnv_v0_2017may.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_HalfCheetahBulletEnv_v0_2017may.py
@@ -1,3 +1,9 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 import numpy as np
 import pybullet as p
diff --git a/examples/pybullet/gym/enjoy_TF_HopperBulletEnv_v0_2017may.py b/examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_HopperBulletEnv_v0_2017may.py
similarity index 99%
rename from examples/pybullet/gym/enjoy_TF_HopperBulletEnv_v0_2017may.py
rename to examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_HopperBulletEnv_v0_2017may.py
index e021156cc..0340fe5db 100644
--- a/examples/pybullet/gym/enjoy_TF_HopperBulletEnv_v0_2017may.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_HopperBulletEnv_v0_2017may.py
@@ -1,3 +1,10 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os
+import inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 import numpy as np
 import pybullet as p
diff --git a/examples/pybullet/gym/enjoy_TF_HumanoidBulletEnv_v0_2017may.py b/examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_HumanoidBulletEnv_v0_2017may.py
similarity index 99%
rename from examples/pybullet/gym/enjoy_TF_HumanoidBulletEnv_v0_2017may.py
rename to examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_HumanoidBulletEnv_v0_2017may.py
index 070b56096..1545813f9 100644
--- a/examples/pybullet/gym/enjoy_TF_HumanoidBulletEnv_v0_2017may.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_HumanoidBulletEnv_v0_2017may.py
@@ -1,3 +1,9 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 import numpy as np
 import pybullet as p
diff --git a/examples/pybullet/gym/enjoy_TF_InvertedDoublePendulumBulletEnv_v0_2017may.py b/examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_InvertedDoublePendulumBulletEnv_v0_2017may.py
similarity index 98%
rename from examples/pybullet/gym/enjoy_TF_InvertedDoublePendulumBulletEnv_v0_2017may.py
rename to examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_InvertedDoublePendulumBulletEnv_v0_2017may.py
index 50fa24650..ee6a0906b 100644
--- a/examples/pybullet/gym/enjoy_TF_InvertedDoublePendulumBulletEnv_v0_2017may.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_InvertedDoublePendulumBulletEnv_v0_2017may.py
@@ -1,3 +1,9 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 import numpy as np
 import pybullet as p
diff --git a/examples/pybullet/gym/enjoy_TF_InvertedPendulumBulletEnv_v0_2017may.py b/examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_InvertedPendulumBulletEnv_v0_2017may.py
similarity index 98%
rename from examples/pybullet/gym/enjoy_TF_InvertedPendulumBulletEnv_v0_2017may.py
rename to examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_InvertedPendulumBulletEnv_v0_2017may.py
index 894f45f00..6550f1efb 100644
--- a/examples/pybullet/gym/enjoy_TF_InvertedPendulumBulletEnv_v0_2017may.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_InvertedPendulumBulletEnv_v0_2017may.py
@@ -1,3 +1,9 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 import numpy as np
 import pybullet as p
diff --git a/examples/pybullet/gym/enjoy_TF_InvertedPendulumSwingupBulletEnv_v0_2017may.py b/examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_InvertedPendulumSwingupBulletEnv_v0_2017may.py
similarity index 98%
rename from examples/pybullet/gym/enjoy_TF_InvertedPendulumSwingupBulletEnv_v0_2017may.py
rename to examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_InvertedPendulumSwingupBulletEnv_v0_2017may.py
index daa97bd4c..165d8097d 100644
--- a/examples/pybullet/gym/enjoy_TF_InvertedPendulumSwingupBulletEnv_v0_2017may.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_InvertedPendulumSwingupBulletEnv_v0_2017may.py
@@ -1,3 +1,9 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 import numpy as np
 import pybullet as p
diff --git a/examples/pybullet/gym/enjoy_TF_Walker2DBulletEnv_v0_2017may.py b/examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_Walker2DBulletEnv_v0_2017may.py
similarity index 99%
rename from examples/pybullet/gym/enjoy_TF_Walker2DBulletEnv_v0_2017may.py
rename to examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_Walker2DBulletEnv_v0_2017may.py
index f8da0978d..62fa07fa0 100644
--- a/examples/pybullet/gym/enjoy_TF_Walker2DBulletEnv_v0_2017may.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/enjoy_TF_Walker2DBulletEnv_v0_2017may.py
@@ -1,7 +1,13 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 import numpy as np
 import pybullet as p
-import envs
+import pybullet_envs
 import time
 
 def relu(x):
diff --git a/examples/pybullet/gym/enjoy_kuka_grasping.py b/examples/pybullet/gym/pybullet_envs/examples/enjoy_kuka_grasping.py
similarity index 67%
rename from examples/pybullet/gym/enjoy_kuka_grasping.py
rename to examples/pybullet/gym/pybullet_envs/examples/enjoy_kuka_grasping.py
index 02f08d69f..5950a593e 100644
--- a/examples/pybullet/gym/enjoy_kuka_grasping.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/enjoy_kuka_grasping.py
@@ -1,3 +1,9 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 from pybullet_envs.bullet.kukaGymEnv import KukaGymEnv
 
diff --git a/examples/pybullet/gym/enjoy_pybullet_cartpole.py b/examples/pybullet/gym/pybullet_envs/examples/enjoy_pybullet_cartpole.py
similarity index 69%
rename from examples/pybullet/gym/enjoy_pybullet_cartpole.py
rename to examples/pybullet/gym/pybullet_envs/examples/enjoy_pybullet_cartpole.py
index 49c43a765..7ede98c6d 100644
--- a/examples/pybullet/gym/enjoy_pybullet_cartpole.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/enjoy_pybullet_cartpole.py
@@ -1,3 +1,9 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 
 from baselines import deepq
diff --git a/examples/pybullet/gym/enjoy_pybullet_racecar.py b/examples/pybullet/gym/pybullet_envs/examples/enjoy_pybullet_racecar.py
similarity index 67%
rename from examples/pybullet/gym/enjoy_pybullet_racecar.py
rename to examples/pybullet/gym/pybullet_envs/examples/enjoy_pybullet_racecar.py
index a37aaefa6..76bfa9d03 100644
--- a/examples/pybullet/gym/enjoy_pybullet_racecar.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/enjoy_pybullet_racecar.py
@@ -1,3 +1,9 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 from pybullet_envs.bullet.racecarGymEnv import RacecarGymEnv
 
diff --git a/examples/pybullet/gym/enjoy_pybullet_zed_racecar.py b/examples/pybullet/gym/pybullet_envs/examples/enjoy_pybullet_zed_racecar.py
similarity index 68%
rename from examples/pybullet/gym/enjoy_pybullet_zed_racecar.py
rename to examples/pybullet/gym/pybullet_envs/examples/enjoy_pybullet_zed_racecar.py
index 1f431b617..acf6cf0f3 100644
--- a/examples/pybullet/gym/enjoy_pybullet_zed_racecar.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/enjoy_pybullet_zed_racecar.py
@@ -1,3 +1,9 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 from pybullet_envs.bullet.racecarZEDGymEnv import RacecarZEDGymEnv
 
diff --git a/examples/pybullet/gym/kukaGymEnvTest.py b/examples/pybullet/gym/pybullet_envs/examples/kukaGymEnvTest.py
similarity index 79%
rename from examples/pybullet/gym/kukaGymEnvTest.py
rename to examples/pybullet/gym/pybullet_envs/examples/kukaGymEnvTest.py
index 70ab6e39a..40ae7e9ec 100644
--- a/examples/pybullet/gym/kukaGymEnvTest.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/kukaGymEnvTest.py
@@ -1,3 +1,8 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
 
 from pybullet_envs.bullet.kukaGymEnv import KukaGymEnv
 import time
diff --git a/examples/pybullet/gym/racecarGymEnvTest.py b/examples/pybullet/gym/pybullet_envs/examples/racecarGymEnvTest.py
similarity index 75%
rename from examples/pybullet/gym/racecarGymEnvTest.py
rename to examples/pybullet/gym/pybullet_envs/examples/racecarGymEnvTest.py
index 113a9be20..6fa07a7b8 100644
--- a/examples/pybullet/gym/racecarGymEnvTest.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/racecarGymEnvTest.py
@@ -1,3 +1,8 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
 
 from pybullet_envs.bullet.racecarGymEnv import RacecarGymEnv
 print ("hello")
diff --git a/examples/pybullet/gym/racecarZEDGymEnvTest.py b/examples/pybullet/gym/pybullet_envs/examples/racecarZEDGymEnvTest.py
similarity index 75%
rename from examples/pybullet/gym/racecarZEDGymEnvTest.py
rename to examples/pybullet/gym/pybullet_envs/examples/racecarZEDGymEnvTest.py
index 75886342b..2a33d456a 100644
--- a/examples/pybullet/gym/racecarZEDGymEnvTest.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/racecarZEDGymEnvTest.py
@@ -1,3 +1,8 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
 
 from pybullet_envs.bullet.racecarZEDGymEnv import RacecarZEDGymEnv
 print ("hello")
diff --git a/examples/pybullet/gym/simpleHumanoidGymEnvTest.py b/examples/pybullet/gym/pybullet_envs/examples/simpleHumanoidGymEnvTest.py
similarity index 65%
rename from examples/pybullet/gym/simpleHumanoidGymEnvTest.py
rename to examples/pybullet/gym/pybullet_envs/examples/simpleHumanoidGymEnvTest.py
index 1d63f7d47..a533f05f4 100644
--- a/examples/pybullet/gym/simpleHumanoidGymEnvTest.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/simpleHumanoidGymEnvTest.py
@@ -1,3 +1,8 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
 
 from pybullet_envs.bullet.simpleHumanoidGymEnv import SimpleHumanoidGymEnv
 print ("hello")
diff --git a/examples/pybullet/gym/train_kuka_cam_grasping.py b/examples/pybullet/gym/pybullet_envs/examples/train_kuka_cam_grasping.py
similarity index 76%
rename from examples/pybullet/gym/train_kuka_cam_grasping.py
rename to examples/pybullet/gym/pybullet_envs/examples/train_kuka_cam_grasping.py
index 7c7471d90..053bc2ab2 100644
--- a/examples/pybullet/gym/train_kuka_cam_grasping.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/train_kuka_cam_grasping.py
@@ -1,3 +1,9 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 from pybullet_envs.bullet.kukaCamGymEnv import KukaCamGymEnv
 
diff --git a/examples/pybullet/gym/train_kuka_grasping.py b/examples/pybullet/gym/pybullet_envs/examples/train_kuka_grasping.py
similarity index 73%
rename from examples/pybullet/gym/train_kuka_grasping.py
rename to examples/pybullet/gym/pybullet_envs/examples/train_kuka_grasping.py
index 92aad6984..4de8130cb 100644
--- a/examples/pybullet/gym/train_kuka_grasping.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/train_kuka_grasping.py
@@ -1,3 +1,9 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 from pybullet_envs.bullet.kukaGymEnv import KukaGymEnv
 
diff --git a/examples/pybullet/gym/train_pybullet_cartpole.py b/examples/pybullet/gym/pybullet_envs/examples/train_pybullet_cartpole.py
similarity index 72%
rename from examples/pybullet/gym/train_pybullet_cartpole.py
rename to examples/pybullet/gym/pybullet_envs/examples/train_pybullet_cartpole.py
index c331943f0..f730d9154 100644
--- a/examples/pybullet/gym/train_pybullet_cartpole.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/train_pybullet_cartpole.py
@@ -1,3 +1,9 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 from pybullet_envs.bullet.cartpole_bullet import CartPoleBulletEnv
 
diff --git a/examples/pybullet/gym/train_pybullet_racecar.py b/examples/pybullet/gym/pybullet_envs/examples/train_pybullet_racecar.py
similarity index 73%
rename from examples/pybullet/gym/train_pybullet_racecar.py
rename to examples/pybullet/gym/pybullet_envs/examples/train_pybullet_racecar.py
index c136c3562..10d0a8328 100644
--- a/examples/pybullet/gym/train_pybullet_racecar.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/train_pybullet_racecar.py
@@ -1,3 +1,9 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 from pybullet_envs.bullet.racecarGymEnv import RacecarGymEnv
 
diff --git a/examples/pybullet/gym/train_pybullet_zed_racecar.py b/examples/pybullet/gym/pybullet_envs/examples/train_pybullet_zed_racecar.py
similarity index 75%
rename from examples/pybullet/gym/train_pybullet_zed_racecar.py
rename to examples/pybullet/gym/pybullet_envs/examples/train_pybullet_zed_racecar.py
index d8fc434b2..499d763f4 100644
--- a/examples/pybullet/gym/train_pybullet_zed_racecar.py
+++ b/examples/pybullet/gym/pybullet_envs/examples/train_pybullet_zed_racecar.py
@@ -1,3 +1,9 @@
+#add parent dir to find package. Only needed for source code build, pip install doesn't need it.
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
 import gym
 from pybullet_envs.bullet.racecarZEDGymEnv import RacecarZEDGymEnv