re-organize theme assets