Update architecture
Delete utils