Fixed build config to build both modules