Increased organization, added support for directional light classes