split the agent/services files to have one class per file