Move toward a more seperated component approach.