Some re-shuffling
A commit