refactoring move server files to infrastructure dir