Removed legacy code. Changed package names.