Reorganized packages, removed unnecessary files.