added struct files and includes