Reorganize package, add index