reorder some methods and files