Rearranging a little; removed some assets