Refactoring library packages

Example app using library in progress...