Added formEncode, urlEncode

Cleaned up a bit

Reorganized the file