Refactor to functional
Don't remove custom framework references - fixes #376
Bump version to 0.16.0-alpha001