merged files, renamed app