got rid of terrible JS "class" crap. Incorporated proper namespaces