Changed file and folderstructure