Merge "Refactoring simulator portal and related files."