Major refactoring
Bump version