Added files consistent with architecture design