Refactoring code in classes
Update info files