Finish putting things in their proper places