Updated porject structure