Remove original architecture
Change basic architecture