Project restructured to utilize Maven