Add: good layout for a package