Started refactoring the components, old code still relevant