Remove backup and swap files, split more logically