Shuffled files into new structure
Removed split-offs