[#37] - Renamed classes appropriately, removed unused interfaces, cleaned up ServicesManager.