I think I have everything in its correct place for now.