Improve [struct]: organizing infractructure