Re-adding and re-organizing the Javascript includes