Moved Effects to subfolder and general cleanup