Change porject archetecture