Reorganize structure for easier management