Team & Main controller
pagination fix
Move repository from memory to FS