rearrange main page
also put all classes in packages