re-arrange and rename content etc
add more stuff