Rearranged some files in order to shrink jar size.