Misc tweaks
Moved some classes from Servcices to Services.Interfaces