Merge pull request #20 from hippagriff/AP-search-bar

Directory re-structure for components and styles
testing fixes
fixes after folder restructure
Merge pull request #22 from hippagriff/testing

Testing
fix for one more broken path
Merge branch 'master' into AP-search-bar