Moved into appropriate packages.
Fixed packages.
Added package info files.