Changed namespaces & added Converter.cs