tweaked: moved working files to upstream folder.