Simplify structure
Update version number