Changed to separate maven projects