reorder file again

since source code can't complie when they're in different file, i make
it togather.