add Classes to strucutre
remove dead file