Updated Nugets and refactored components