Change architecture
Delete old code