Change old files to intellij layout
Merge conflict