refactor into separate concerns

fix issues with trailing dots

yaml errors

First release