Tidying classes in src/agent