Put everything in its right place

1100