Refactoring Company Investments and Reporting Company