moved all top level package classes to main
news: fixed minor typo