Reorganize the structure, ready to go