Reorganize files + add error traces in bash.