Moved some files local, tweaked javascript a bit