Moved samples again to get Component to reference things properly
Reorganized some solution code