Updated project sturcture