More reorganization of the architecture
Fixing includes/link after changes in architecture
Fix linking/compilation of test Selection code