Commenting FTW
Updating language files
Move two classes to another namespace