Minor improvement and files reordering.