Fixed conflicts, adds documentation and renames folders