changes in filestructure, added comments