Shuffling some more files
Rework