Reorganised code
Bumped version