This is where they should be as far as ember is concerned. Note this is a huge commit and we should be really careful everything continues to work properly.
