commit renamed index and package (from Paul version)