Merge "Refactoring and fixing Docs"