Move everything into it's right place