Organize the code.
Merge branch '6054-1' of github.com:openscholar/openscholar into 6054-1.