Reorganize skeleton