Restructure for compatibility with updated scaffolder
Bump version to 0.4.4