Fixed file conflicts

there were 3 source folders