Add YAML based definition, clean up
Add Apache license