Move all JS to file, Fix Terminology