Storm added , project structured a bit