Updated component diagram according to friday meeting. Less is more