readjust file structure ; bugfix #2