Moved cv partitioning to a separate method
Moved cv partitioning to other method
Resolved conflicts. Moved types to new package. Removed some temp files