changed folderstructure