Replace main structure with proper package
Add info function