Cleanup gatway-fabric to use component coding conventions