Restructured code
Bump version number