added maven support, restructured packages