Mostly moved some things around. Also added eclim; had to fix jsctags.