Changed file structure for merging