Change around of the file structure