Fixed version number in manifest
modularised a bit