merge front-end back-end updated file structure