Added Fire preset

Cleanup and moved some files around