Fixing bugs with undefined classes, moved classes to the new more apropriate places, changed namespace locations.