Adding Structural / Facade impl and test