Instance objects

Changed all static classed and objects to instance classes and objects.