removed tx boundaries again, added subfolders for files