make prepper classes, refactor specs, restruvture folders