Deal with different layouts
Add method to append_layout
Use Path.basename to compare filenames