Make it work™
Remove unused modules.am
set correct dep for moc