Restructure packages and add package info