Updated projectstructure