reorganize everything