Project re-org to support maven based project structure.