Architecture and decoration

@merileymedeiros

Follow