Changed filestructure
Fixed conflicts