move portlets to proper package