improve layouting
Move stuff around
Add package-info:s