Simplified folders and package info.