Redecoupage architecture
Major cleanup and refacto