Move to lib/
Add formatter
Use formatter