change components order
Merge pull request #255 from allmobilize/codename-h

change components order