Shuffle, solve, refactor libraries