Server: Small change to module naming
Server/Agent: Agent registration [WIP]