bugfix file structure