Moved effectstuff to own files