Fix #1: Package structure and setup script updated.