removed some old code
fixed main selector to include all main-methods and complete package