Put some order on the files

Comment #1