Added better rest / static structure