Improved backup, implemented directory merge