Fixed up my javascript a ton and changed to more uniform file names