b42bfdc reorganize everything