Updated project to new static structure