Reorganize everything