Adding some parts about architecture
A bit of reorganizing