Regrouped some files and added a few comments.