Split Effects into seperate files

And a few other tweaks.