Added architecture files. Minor code changes.