I was worried for a bit that you might've been running 1.4 based on the appearance of some of the files.
Any difference after making those changes? Another option is to start fresh and makes changes slowly, testing along the way. It sucks as I've had to throw whole mods away and start my work over myself, but sometimes you need to.