Reorganized some stuffs