Completely reorganized project into two maven modules