convert to package format

Just an example to see how things can be simplified