Back to training + CV + testing

Made generic code for splitting the data
Split 80-20 for training / testing