put components into own folders
updated references in tests
removed factory functions