Cleanup and TargetMapping refactor
Metadata load from .CS in separate project
Solution Reorg