Changed to Multi Module Project