Adds architecture layers

Fix done, see new pull request