Renamed interfaces and moved interfaces to your namespace