Fix package directory.
Finish basic implementation.