Enabled modules, removed explicit linking to libraries