created some files
merge conflict solved
better folder structure