Reorganized folders.
Fixed merge conflict.