Proper packages. First working version.